]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Revert a change that shouldn't have been backported to 49.x
authorSimon McVittie <smcv@debian.org>
Tue, 27 Jan 2026 16:36:08 +0000 (16:36 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 27 Jan 2026 16:36:08 +0000 (16:36 +0000)
Upstream suggested this as a possible trigger for regressions in
modesetting during first login on some systems (the regression seems to
be specific to AMD GPUs, but not all AMD GPUs are affected) and it
seems that it was developed for v50, under the assumption that gdm3
changes from v50 would be present.

For whatever reason (possibly timing-dependent), this was reported
in Debian 13 but not in testing/unstable.

Closes: #1125941, #1125273, #1125275, #1126174
debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch b/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch
new file mode 100644 (file)
index 0000000..6cccdb2
--- /dev/null
@@ -0,0 +1,41 @@
+From: Joan Torres Lopez <joantolo@redhat.com>
+Date: Tue, 27 Jan 2026 13:33:36 +0100
+Subject: Revert "main: Register session with GDM on startup"
+
+This depends on GDM changes that are not in this release.
+
+This reverts commit 6457a1454a05bac8f7e172c17fbcb2b5baeae619.
+
+Origin: upstream, 49.4, commit:ba60daead6a54ec02ed5aa2841e72cd5acb591cb
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8983
+Bug: https://gitlab.gnome.org/GNOME/mutter/-/issues/4572
+Bug-Debian: https://bugs.debian.org/1125273
+Bug-Debian: https://bugs.debian.org/1125275
+Bug-Debian: https://bugs.debian.org/1125941
+Bug-Debian: https://bugs.debian.org/1126174
+---
+ js/ui/main.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/main.js b/js/ui/main.js
+index bd39063..4a011f2 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -335,8 +335,6 @@ async function _initializeUI() {
+     extensionManager = new ExtensionSystem.ExtensionManager();
+     extensionManager.init();
+ 
+-    LoginManager.registerSessionWithGDM();
+-
+     if (sessionMode.isGreeter && screenShield) {
+         layoutManager.connect('startup-prepared', () => {
+             screenShield.showDialog();
+@@ -383,6 +381,8 @@ async function _initializeUI() {
+             sessionMode.currentMode !== 'initial-setup')
+             _handleLockScreenWarning();
+ 
++        LoginManager.registerSessionWithGDM();
++
+         if (perfModule) {
+             let perfOutput = GLib.getenv('SHELL_PERF_OUTPUT');
+             Scripting.runPerfScript(perfModule, perfOutput);
index d4eeab706e218fc08e0634c66e3f73886870fb46..b36b666b7e2bbc9c559bae9fa88b3b5eb6a2dba7 100644 (file)
@@ -1,3 +1,4 @@
+Revert-main-Register-session-with-GDM-on-startup.patch
 debian/Revert-tests-Fail-on-warnings-too.patch
 shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
 debian/data-Add-im-config.desktop-to-System-folder.patch